bitkeeper revision 1.16 (3e256e80_sVhHRajq5OeU_8MGxwZ_w)

attampt to merge :)

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/logging_ok
index bf45a4d7d0c7ccc01839344a8e3dd9871a250ddd,7ba61cbc20655a8bdbe6b29bbc2e5d40a8dcdb0a..af88da45af7b8ffa5d076112f58f9227df62b026
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -1,7 -1,6 +1,9 @@@
  akw27@boulderdash.cl.cam.ac.uk
 +akw27@labyrinth.cl.cam.ac.uk
++bd240@boulderdash.cl.cam.ac.uk
  kaf24@labyrinth.cl.cam.ac.uk
  kaf24@plym.cl.cam.ac.uk
  kaf24@striker.cl.cam.ac.uk
+ lynx@idefix.cl.cam.ac.uk
  smh22@boulderdash.cl.cam.ac.uk
 +smh22@uridium.cl.cam.ac.uk

diff --cc xen-2.4.16/arch/i386/entry.S
Simple merge

diff --cc xen-2.4.16/common/domain.c
index 31ae0b97262afda24e07c40f99c02027d25428fa,d5ec075015a37225879fcbd615988d0824d080d6..ae78a25c591d1acec122702a22a2bec9edbee49d
--- 1/xen-2.4.16/common/domain.c
--- 2/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@@ -10,7 -11,16 +10,16 @@@
  #include <xeno/event.h>
  #include <xeno/dom0_ops.h>
  #include <asm/io.h>
 -
 +#include <asm/domain_page.h>
+ #include <asm/msr.h>
+ #include <xeno/multiboot.h>
+ 
+ #define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_USER|_PAGE_ACCESSED)
+ #define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_USER|_PAGE_ACCESSED|_PAGE_DIRTY)
+ 
+ extern int nr_mods;
+ extern module_t *mod;
+ extern unsigned char *cmdline;
  
  rwlock_t tasklist_lock __cacheline_aligned = RW_LOCK_UNLOCKED;
  
@@@ -389,19 -514,13 +516,14 @@@ int final_setup_guestos(struct task_str
   *      <one page>
   */
  #define MB_PER_DOMAIN 16
- #include <asm/msr.h>
- #include <xeno/multiboot.h>
- extern int nr_mods;
- extern module_t *mod;
- extern unsigned char *cmdline;
  int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
  {
 -#define ALLOC_PAGE_FROM_DOMAIN() \
 -  ({ alloc_address -= PAGE_SIZE; __va(alloc_address); })
 +#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_USER|_PAGE_ACCESSED)
 +#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_USER|_PAGE_ACCESSED|_PAGE_DIRTY)
 +#define ALLOC_FRAME_FROM_DOMAIN() (alloc_address -= PAGE_SIZE)
      char *src, *dst;
      int i, dom = p->domain;
 -    unsigned long start_address = MAX_MONITOR_ADDRESS;
 +    unsigned long start_address, phys_l1tab, phys_l2tab;
      unsigned long cur_address, end_address, alloc_address, vaddr;
      unsigned long virt_load_address, virt_stack_address, virt_shinfo_address;
      unsigned long virt_ftable_start_addr = 0, virt_ftable_end_addr;

diff --cc xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
Simple merge

diff --cc xen-2.4.16/include/xeno/sched.h
Simple merge

diff --cc xenolinux-2.4.16-sparse/include/asm-xeno/mmu_context.h
Simple merge

diff --cc xenolinux-2.4.16-sparse/include/asm-xeno/pgtable.h
Simple merge